Added logic from other module