Changed from runnable to basic classes