added more helper methods, added some scoping filters