diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23c38cb..75aafb1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,4 +92,4 @@ file(REMOVE_RECURSE "${BUILD_DIRECTORY}/SDL2_gpu.lib")
 file(REMOVE_RECURSE "${BUILD_DIRECTORY}/soloud_static.lib")
 file(REMOVE_RECURSE "${BUILD_DIRECTORY}/libmodplug.lib")
 
-# :)
\ No newline at end of file
+# :)
diff --git a/src/Main.cpp b/src/Main.cpp
index b091098..98d36ac 100644
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -53,8 +53,8 @@ class ExampleState : public sdfml::sdState {
             if (sdfml::key_just_pressed(SDL_SCANCODE_R))
                 sdfml::switchState(this);
 
-            bg1.scale.x = sin(sdfml::elapsed/100);
-            bg1.scale.y = cos(sdfml::elapsed/100);
+            bg1.scale.x = sin(sdfml::elapsed);
+            bg1.scale.y = cos(sdfml::elapsed);
 
             bg1.screenCenter();
 
diff --git a/src/libflixel.hpp b/src/libflixel.hpp
index 69f7d4e..1fa4623 100644
--- a/src/libflixel.hpp
+++ b/src/libflixel.hpp
@@ -543,7 +543,7 @@ namespace sdfml {
 
             float elapsedMS = (float)(end - start) / SDL_GetPerformanceFrequency() * 1000.0f;
 
-            elapsed += 1;
+            elapsed = SDL_GetTicks()/1000.0f;
 
             SDL_Delay(floor((1000.0f/FRAMERATE) - elapsedMS));