diff --git a/YACOSCore/ejbModule/org/yacos/core/article/Article.java b/YACOSCore/ejbModule/org/yacos/core/article/Article.java
index aa94eea..f131fa2 100644
--- a/YACOSCore/ejbModule/org/yacos/core/article/Article.java
+++ b/YACOSCore/ejbModule/org/yacos/core/article/Article.java
@@ -59,8 +59,8 @@ public class Article implements Serializable {
 	@ManyToMany(targetEntity=User.class)
 	@JoinTable(
 		name="articles_pcmembers_map",
-		joinColumns=@JoinColumn(name="user_id"),
-		inverseJoinColumns=@JoinColumn(name="article_id")
+		inverseJoinColumns=@JoinColumn(name="user_id"),
+		joinColumns=@JoinColumn(name="article_id")
 	)
 	private List<User> pcMembers;
 	
@@ -169,8 +169,8 @@ public class Article implements Serializable {
 	@ManyToMany(targetEntity=User.class)
 	@JoinTable(
 		name="articles_pcmembers_map",
-		joinColumns=@JoinColumn(name="user_id"),
-		inverseJoinColumns=@JoinColumn(name="article_id")
+		inverseJoinColumns=@JoinColumn(name="user_id"),
+		joinColumns=@JoinColumn(name="article_id")
 	)
 	public List<User> getPcMembers() {
 		return pcMembers;
@@ -178,8 +178,8 @@ public class Article implements Serializable {
 	@ManyToMany(targetEntity=User.class)
 	@JoinTable(
 		name="articles_pcmembers_map",
-		joinColumns=@JoinColumn(name="user_id"),
-		inverseJoinColumns=@JoinColumn(name="article_id")
+		inverseJoinColumns=@JoinColumn(name="user_id"),
+		joinColumns=@JoinColumn(name="article_id")
 	)
 	public void setPcMembers(List<User> pcMembers) {
 		this.pcMembers = pcMembers;
diff --git a/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java b/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java
index d151f0f..572bee4 100644
--- a/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java
+++ b/YACOSCore/ejbModule/org/yacos/core/article/ArticleManagerBean.java
@@ -165,23 +165,29 @@ public class ArticleManagerBean implements IArticleManager, Serializable {
 		query.setParameter(2, member);
 		return query.getResultList();
 	}
+	
+	@SuppressWarnings("unchecked")
+	public List<Article> getArticlesOfReferee(String refereeId) {
+		User referee = em.find(User.class, refereeId);
+		Query query = em.createQuery("from Delegation WHERE referee = ?");
+		query.setParameter(1, referee);
+		
+		List<Article> listArticleOfReferee;
+		List<Delegation> deleg = query.getResultList();
+		if (deleg != null) {
+			listArticleOfReferee = new ArrayList<Article>();
+			for (Delegation d : deleg) {
+				listArticleOfReferee.add(d.getArticle());
+			}
+			return listArticleOfReferee;
+		}
+		else return null;
+	}
 
 	public Conference getConferenceForArticle(Integer articleId) {
-		//try {
-			//ut.begin();
-			Article article = em.find(Article.class, articleId);
-			Conference conf = article.getConference();
-			//ut.commit();
-			return conf;
-		/*} catch (Exception e) {
-			try {
-				ut.rollback();
-			} catch (Exception e1) {
-				e1.printStackTrace();
-			}
-			e.printStackTrace();
-		}
-		return null;*/
+		Article article = em.find(Article.class, articleId);
+		Conference conf = article.getConference();
+		return conf;
 	}
 
 
diff --git a/YACOSCore/ejbModule/org/yacos/core/article/IArticleManager.java b/YACOSCore/ejbModule/org/yacos/core/article/IArticleManager.java
index 8da3c26..dbc5c41 100644
--- a/YACOSCore/ejbModule/org/yacos/core/article/IArticleManager.java
+++ b/YACOSCore/ejbModule/org/yacos/core/article/IArticleManager.java
@@ -34,6 +34,10 @@ public interface IArticleManager {
 	public List<Article> getArticles(Integer confId) throws ConferenceDoesntExistException;
 	public List<Article> getArticleOfAuthor(Integer confId, String authorId);
 	public List<Article> getArticlesOfMember(Integer confId, String memberId);
+	/*
+	 * Return all the articles of a referee
+	 */
+	public List<Article> getArticlesOfReferee(String refereeId);
 	//public List<Article> getAllArticles();
 	
 	/*