finished split, changed some method functionality
updated