fixed if. TODO: empty method statements!!