updated for 1.1