Cleaned Sub.lam a bit more