Not using marker file anymore