final changes

Should work in any environment