modified few fixtures..