Fixed bug and Adding whenever