Finally working properly.