stef's changes