updated for scala 2.10