Removed test code. Added support offer for two scenarios