removed some changes from Faux