added logic for prop view