A few changes - preparing for testing