dogster done
pull from avi's branach