changed so that it can be part of other project