remix and added a few things!