nikkis changes
merge fix