used proxy function instead of Command
Review fixes