+merge part1
+ did some merging & added in the teleportation animation