update to 3.0 style (fixes #3)