changed some numbers, gonna test in the morning