Issue 6,12,18 (re push)