ok, will do it today and global refactoring.