Added worker, corrected some methods, improved layout and made distance check bigger