Added more flexibily in the terms of resolution