New setup for 3k version