Added limitations on selection