finalised work on batch entries