fixed wrong method call and shortened stuff