updated to remove money functions