Changed movement approach and added rays