Updated many memory issues :)