Updated as per TheJJ comments