first version
fixes