made methods modification safe