changes from felix