added 2 FAP points and nicer placeholders