updated with basic views