new fixes and functions