working on finishing both