Made it finally work