Both suggestions implemented