Add more condition for point