Fixed the stuff, integrate later
merge conflicts in outpost.java