changes to way prop is handled