Fixed Moranondorf

Still need to balance numbers