new version with some solved issues