changes according to discussing with ragingsquirrel