merged changes, using mvc structure