Sped stuff up a bit
Updated