Monje's performance improvements