Resolved some shit