Cleaned for the ngview idea