seperate logic magic revamp and so on itsself :-)