Changed things this commit will be amended later