Added obstacles and improved performance