Added better feedback