fixing existing functionality; added shape info