Added new stuff from Luke