Version 4.1 almost finished