some additions of what I was working on