Personal conditinals modifications

javascript modified