some more changes. The final changes maybe?