added pieces I forgot to commit