This is an update to my first fork