Added more restrictions