switched to api level 10 and cleaned