Updated to include Edit Texts