refactoring
added xshear config stuff
refactoring