changed system architecture again =)