Replaced massive fa with custom build