General code update

Just needed to sync