Improved models
Modified models and implemented part of collision logic