Fixed changes based of feedback