Updated it to finally work kinda