1st version
fixes