621j fixed some areas