now working on 1c as well