Updates, fixed Memory Leak