Save Money and some code changes