finishing concept stuff so it doesn't break anything...