Added better pattern