Modifications to .m file