updated to work with new package structure