Added code for some other pieces