Finally working now