Changed some constants, works better, not good still