UNSTABLE - Some minor changes