wip changing code back to old style for ubuntu consistency
wip changing code back to old style for ubuntu consistency
wip changing code back to old style for ubuntu consistency