removed static
added data dir
merge