Updating and fixing this thing