Improved handler, added random starting position