updated for 1.0