updated for the recent refactoring
style