merged w deverika and fix empty container error