making it work with all changes