lots of changes, new view etc