refactoring
merge fix
star fixed
stars fixed
merge from alex