Changes, this thing works properly now