From 181 to 140MB + fixes