stars fixed
merge from alex