Manually Added Changes By @benjojo