Removed harcoded elapsedTime