Lotta updates and testing