Made a bit better..