Some things has been changed but it is not yet working