changing to work in all systems