Properly working now