Requested Changes added / cleaned up syntax