more code and moved old code to oldcode