lotsa stuff added