updated with fixed border