YES YES YES YES

to both suggestions