work on views
merge old files