TO BE REFACTORED..

Signed-off-by: Horváth Balázs <qqroach@riftworks.org>