Modifications from cob3