some changes
working on build