changed where markup is included
changed where and how markup is initialized