My changes from seggs