minor changes
place order refactoring
resolving pull issue