Added checking if empty