Added error logic
Added Square Names