Revamped for new sysytem
A few extras for the new system