adding && fixing