Added Dereks changes