Some optimizations to see if it works

Not sure if this will work.