changed some imports, added sample data