Added simple version of Phase-2