CLEANED UP: fixed indicent exposure