All working, remaining modification ;)