Haven't used git for a while, no idea what I changed
Added an optimization code (test).