Worked on proposition - will works soon