Looks good with those changes thanks @davilla