Implemented edits made by OffLuffy