fixed up features