added method
added dirs
fixed merge error