general update, added 3.3 compatibility