Removed some jerkiness