adding some view shit
MERGE