Made big finalization.. Probably final version.