Fixing Alec's code
Merging stuffz