Some Mondego specific code, makes my life easier =)
Another small change