Some testing and changed movement