final version
deleted stuff