Some more changes, everything more realistic