update with sk tables
edit table names
fix conflicts