props-related code added