New branch with fixes