Not sure if done correctly
The methods changed contain the keyword TODO