Manually added stuff from DiggerNick