diff --git a/fps.txt b/fps.txt
index f122c77..ffb358f 100644
--- a/fps.txt
+++ b/fps.txt
@@ -1,1741 +1,2806 @@
-4 115
-5 124
-6 103
-7 131
-8 72
-9 88
-10 92
-11 126
-12 79
-13 79
-14 77
-15 78
-16 98
-17 90
-18 108
-19 78
-20 120
-21 125
-22 90
-23 90
-24 112
-25 79
-26 88
-27 83
-28 87
-29 85
-30 101
-31 71
-32 101
-33 120
-34 90
-35 67
-36 97
-37 93
-38 121
-39 72
-40 87
-41 77
-42 85
-43 81
-44 79
-45 78
-46 112
-47 97
-48 110
-49 74
-50 78
-51 56
-52 80
-53 81
-54 71
-55 73
-56 74
-57 72
-58 72
-59 71
-60 71
-61 96
-62 69
-63 90
-64 66
-65 69
-66 63
-67 75
-68 72
-69 66
-70 75
-71 68
-72 68
-73 75
-74 63
-75 74
-76 69
-77 61
-78 59
-79 47
-80 71
-81 63
-82 63
-83 56
-84 62
-85 49
-86 44
-87 58
-88 54
-89 52
-90 56
-91 61
-92 57
-93 52
-94 57
-95 57
-96 52
-97 55
-98 44
-99 48
-100 44
-101 48
-102 44
-103 44
-104 53
-105 45
-106 42
-107 49
-108 41
-109 43
-110 49
-111 36
-112 45
-113 38
-114 36
-115 42
-116 32
-117 45
-118 34
-119 46
-120 36
-121 38
-122 39
-123 45
-124 35
-125 37
-126 35
-127 40
-128 35
-129 37
-130 34
-131 42
-132 33
-133 38
-134 33
-135 37
-136 28
-137 40
-138 31
-139 36
-140 29
-141 31
-142 30
-143 34
-144 26
-145 34
-146 27
-147 33
-148 29
-149 31
-150 31
-151 28
-152 36
-153 28
-154 34
-155 27
-156 30
-157 29
-158 30
-159 31
-160 25
-161 35
-162 25
-163 35
-164 27
-165 29
-166 29
-167 29
-168 32
-169 27
-170 37
-171 27
-172 35
-173 30
-174 32
-175 29
-176 37
-177 28
-178 35
-179 30
-180 37
-181 31
-182 41
-183 35
-184 40
-185 34
-186 43
-187 33
-188 41
-189 36
-190 48
-191 34
-192 35
-193 45
-194 33
-195 50
-196 36
-197 38
-198 35
-199 38
-200 48
-201 37
-202 54
-203 47
-204 39
-205 57
-206 46
-207 38
-208 52
-209 47
-210 48
-211 51
-212 40
-213 61
-214 57
-215 49
-216 64
-217 59
-218 55
-219 63
-220 59
-221 58
-222 70
-223 60
-224 60
-225 60
-226 80
-227 74
-228 68
-229 69
-230 81
-231 68
-232 64
-233 74
-234 89
-235 68
-236 75
-237 85
-238 94
-239 94
-240 79
-241 105
-242 93
-243 89
-244 96
-245 83
-246 76
-247 114
-248 91
-249 83
-250 105
-251 96
-252 102
-253 97
-254 74
-255 132
-256 122
-257 102
-258 93
-259 90
-260 84
-261 118
-262 96
-263 107
-264 97
-265 93
-266 83
-267 149
-268 125
-269 142
-270 118
-271 140
-272 207
-273 197
-274 147
-275 153
-276 131
-277 123
-278 167
-279 152
-280 148
-281 146
-282 134
-283 198
-284 125
-285 243
-286 146
-287 207
-288 145
-289 170
-290 146
-291 135
-292 182
-293 210
-294 142
-295 184
-296 141
-297 176
-298 142
-299 221
-300 198
-301 163
-302 111
-303 198
-304 174
-305 124
-306 178
-307 173
-308 173
-309 164
-310 138
-311 162
-312 138
-313 141
-314 152
-315 200
-316 144
-317 146
-318 229
-319 128
-320 133
-321 219
-322 106
-323 185
-324 178
-325 149
-326 184
-327 114
-328 144
-329 156
-330 126
-331 201
-332 145
-333 168
-334 140
-335 171
-336 192
-337 181
-338 166
-339 204
-340 130
-341 216
-342 143
-343 206
-344 148
-345 189
-346 164
-347 197
-348 181
-349 210
-350 225
-351 194
-352 179
-353 134
-354 121
-355 119
-356 149
-357 206
-358 149
-359 158
-360 149
-361 157
-362 121
-363 206
-364 125
-365 304
-366 145
-367 179
-368 189
-369 160
-370 173
-371 172
-372 162
-373 187
-374 236
-375 233
-376 218
-377 160
-378 176
-379 187
-380 170
-381 237
-382 231
-383 226
-384 155
-385 191
-386 176
-387 178
-388 202
-389 170
-390 255
-391 120
-392 210
-393 208
-394 141
-395 177
-396 265
-397 139
-398 180
-399 158
-400 161
-401 174
-402 174
-403 182
-404 222
-405 216
-406 167
-407 273
-408 165
-409 206
-410 226
-411 230
-412 174
-413 113
-414 197
-415 204
-416 160
-417 225
-418 176
-419 177
-420 170
-421 181
-422 229
-423 160
-424 211
-425 161
-426 208
-427 130
-428 212
-429 140
-430 220
-431 149
-432 168
-433 144
-434 307
-435 198
-436 246
-437 154
-438 204
-439 142
-440 251
-441 164
-442 184
-443 187
-444 194
-445 187
-446 215
-447 147
-448 140
-449 219
-450 156
-451 188
-452 130
-453 148
-454 214
-455 165
-456 121
-457 204
-458 206
-459 131
-460 242
-461 136
-462 183
-463 129
-464 214
-465 149
-466 230
-467 148
-468 120
-469 186
-470 207
-471 138
-472 187
-473 145
-474 186
-475 179
-476 206
-477 154
-478 160
-479 140
-480 144
-481 203
-482 137
-483 185
-484 189
-485 209
-486 140
-487 186
-488 128
-489 128
-490 145
-491 189
-492 169
-493 169
-494 190
-495 176
-496 158
-497 156
-498 176
-499 161
-500 193
-501 169
-502 215
-503 155
-504 188
-505 134
-506 140
-507 175
-508 145
-509 160
-510 179
-511 220
-512 157
-513 187
-514 138
-515 160
-516 134
-517 131
-518 158
-519 177
-520 172
-521 187
-522 168
-523 159
-524 136
-525 152
-526 129
-527 151
-528 184
-529 157
-530 179
-531 195
-532 205
-533 216
-534 234
-535 177
-536 254
-537 194
-538 178
-539 223
-540 221
-541 165
-542 165
-543 167
-544 224
-545 214
-546 163
-547 206
-548 166
-549 231
-550 206
-551 200
-552 252
-553 215
-554 169
-555 217
-556 180
-557 209
-558 170
-559 248
-560 163
-561 185
-562 234
-563 225
-564 256
-565 84
-566 1239
-567 220
-568 211
-569 174
-570 238
-571 219
-572 160
-573 182
-574 226
-575 220
-576 209
-577 164
-578 173
-579 175
-580 176
-581 162
-582 273
-583 200
-584 221
-585 247
-586 231
-587 189
-588 171
-589 232
-590 171
-591 210
-592 240
-593 220
-594 203
-595 161
-596 189
-597 162
-598 203
-599 177
-600 196
-601 157
-602 205
-603 209
-604 237
-605 170
-606 213
-607 215
-608 144
-609 225
-610 166
-611 262
-612 173
-613 230
-614 234
-615 236
-616 184
-617 205
-618 153
-619 248
-620 250
-621 167
-622 187
-623 226
-624 223
-625 209
-626 244
-627 231
-628 234
-629 146
-630 224
-631 162
-632 183
-633 166
-634 181
-635 175
-636 223
-637 209
-638 211
-639 153
-640 176
-641 178
-642 177
-643 161
-644 170
-645 227
-646 198
-647 207
-648 203
-649 133
-650 196
-651 147
-652 220
-653 154
-654 141
-655 227
-656 159
-657 256
-658 198
-659 238
-660 218
-661 166
-662 161
-663 292
-664 179
-665 178
-666 198
-667 220
-668 188
-669 229
-670 211
-671 231
-672 144
-673 280
-674 204
-675 194
-676 201
-677 230
-678 183
-679 193
-680 176
-681 194
-682 186
-683 191
-684 160
-685 261
-686 162
-687 188
-688 192
-689 172
-690 206
-691 211
-692 117
-693 217
-694 215
-695 177
-696 189
-697 169
-698 167
-699 169
-700 208
-701 177
-702 203
-703 212
-704 142
-705 213
-706 153
-707 138
-708 198
-709 161
-710 194
-711 197
-712 181
-713 186
-714 169
-715 190
-716 199
-717 177
-718 181
-719 178
-720 167
-721 179
-722 186
-723 179
-724 180
-725 195
-726 175
-727 182
-728 174
-729 137
-730 253
-731 160
-732 192
-733 172
-734 217
-735 171
-736 218
-737 209
-738 179
-739 210
-740 222
-741 188
-742 226
-743 216
-744 159
-745 202
-746 229
-747 199
-748 187
-749 210
-750 242
-751 178
-752 256
-753 231
-754 178
-755 216
-756 206
-757 234
-758 185
-759 196
-760 215
-761 201
-762 244
-763 212
-764 214
-765 206
-766 239
-767 241
-768 199
-769 216
-770 218
-771 191
-772 222
-773 205
-774 186
-775 229
-776 209
-777 145
-778 213
-779 215
-780 223
-781 201
-782 217
-783 213
-784 197
-785 218
-786 212
-787 246
-788 227
-789 221
-790 233
-791 234
-792 193
-793 223
-794 220
-795 215
-796 231
-797 229
-798 218
-799 223
-800 237
-801 256
-802 246
-803 204
-804 227
-805 232
-806 241
-807 216
-808 254
-809 215
-810 273
-811 286
-812 169
-813 233
-814 223
-815 289
-816 182
-817 226
-818 170
-819 252
-820 275
-821 255
-822 258
-823 268
-824 199
-825 226
-826 235
-827 262
-828 253
-829 228
-830 237
-831 226
-832 278
-833 221
-834 261
-835 255
-836 221
-837 182
-838 350
-839 275
-840 235
-841 277
-842 252
-843 275
-844 294
-845 250
-846 253
-847 286
-848 275
-849 237
-850 182
-851 387
-852 241
-853 248
-854 263
-855 262
-856 280
-857 249
-858 254
-859 232
-860 244
-861 214
-862 245
-863 229
-864 231
-865 224
-866 240
-867 229
-868 223
-869 269
-870 225
-871 262
-872 223
-873 217
-874 258
-875 216
-876 215
-877 219
-878 249
-879 232
-880 214
-881 227
-882 274
-883 234
-884 236
-885 210
-886 231
-887 261
-888 233
-889 225
-890 259
-891 279
-892 229
-893 228
-894 257
-895 122
-896 224
-897 217
-898 231
-899 205
-900 211
-901 221
-902 227
-903 208
-904 231
-905 254
-906 197
-907 181
-908 235
-909 209
-910 226
-911 203
-912 193
-913 243
-914 215
-915 238
-916 197
-917 257
-918 243
-919 210
-920 188
-921 238
-922 229
-923 238
-924 261
-925 228
-926 237
-927 201
-928 235
-929 251
-930 220
-931 229
-932 250
-933 223
-934 253
-935 186
-936 228
-937 265
-938 236
-939 228
-940 258
-941 290
-942 282
-943 266
-944 264
-945 254
-946 290
-947 241
-948 275
-949 303
-950 259
-951 255
-952 302
-953 250
-954 313
-955 303
-956 322
-957 282
-958 301
-959 259
-960 289
-961 284
-962 269
-963 282
-964 313
-965 272
-966 318
-967 260
-968 330
-969 272
-970 273
-971 277
-972 255
-973 270
-974 219
-975 254
-976 271
-977 281
-978 258
-979 316
-980 267
-981 255
-982 341
-983 220
-984 336
-985 231
-986 275
-987 255
-988 251
-989 261
-990 280
-991 312
-992 279
-993 256
-994 284
-995 254
-996 312
-997 266
-998 249
-999 259
-1000 285
-1001 238
-1002 256
-1003 230
-1004 291
-1005 301
-1006 275
-1007 210
-1008 329
-1009 254
-1010 291
-1011 226
-1012 296
-1013 274
-1014 261
-1015 268
-1016 240
-1017 271
-1018 226
-1019 304
-1020 240
-1021 293
-1022 222
-1023 258
-1024 286
-1025 251
-1026 241
-1027 227
-1028 243
-1029 305
-1030 291
-1031 214
-1032 230
-1033 291
-1034 275
-1035 272
-1036 239
-1037 284
-1038 250
-1039 268
-1040 328
-1041 272
-1042 291
-1043 287
-1044 242
-1045 318
-1046 259
-1047 303
-1048 281
-1049 237
-1050 345
-1051 260
-1052 281
-1053 207
-1054 392
-1055 307
-1056 259
-1057 289
-1058 265
-1059 226
-1060 306
-1061 237
-1062 288
-1063 260
-1064 265
-1065 246
-1066 248
-1067 255
-1068 214
-1069 279
-1070 218
-1071 251
-1072 257
-1073 226
-1074 264
-1075 259
-1076 217
-1077 267
-1078 275
-1079 231
-1080 268
-1081 244
-1082 231
-1083 310
-1084 256
-1085 309
-1086 233
-1087 276
-1088 303
-1089 232
-1090 259
-1091 280
-1092 264
-1093 302
-1094 265
-1095 249
-1096 308
-1097 251
-1098 323
-1099 217
-1100 281
-1101 290
-1102 245
-1103 251
-1104 342
-1105 259
-1106 327
-1107 260
-1108 343
-1109 301
-1110 281
-1111 247
-1112 298
-1113 270
-1114 294
-1115 277
-1116 289
-1117 268
-1118 267
-1119 214
-1120 253
-1121 309
-1122 295
-1123 238
-1124 158
-1125 162
-1126 271
-1127 321
-1128 219
-1129 258
-1130 335
-1131 262
-1132 294
-1133 250
-1134 271
-1135 323
-1136 311
-1137 255
-1138 326
-1139 263
-1140 246
-1141 310
-1142 297
-1143 275
-1144 306
-1145 314
-1146 286
-1147 316
-1148 276
-1149 313
-1150 310
-1151 266
-1152 314
-1153 266
-1154 340
-1155 248
-1156 290
-1157 293
-1158 267
-1159 298
-1160 243
-1161 210
-1162 359
-1163 258
-1164 297
-1165 254
-1166 295
-1167 232
-1168 255
-1169 311
-1170 215
-1171 234
-1172 254
-1173 215
-1174 278
-1175 283
-1176 213
-1177 150
-1178 229
-1179 233
-1180 256
-1181 243
-1182 206
-1183 276
-1184 224
-1185 257
-1186 254
-1187 222
-1188 267
-1189 205
-1190 250
-1191 227
-1192 262
-1193 276
-1194 167
-1195 235
-1196 243
-1197 293
-1198 231
-1199 297
-1200 211
-1201 223
-1202 273
-1203 198
-1204 227
-1205 240
-1206 237
-1207 265
-1208 230
-1209 221
-1210 248
-1211 206
-1212 211
-1213 238
-1214 223
-1215 202
-1216 229
-1217 217
-1218 249
-1219 211
-1220 220
-1221 209
-1222 220
-1223 225
-1224 274
-1225 174
-1226 229
-1227 201
-1228 233
-1229 228
-1230 247
-1231 246
-1232 270
-1233 272
-1234 216
-1235 249
-1236 270
-1237 270
-1238 266
-1239 211
-1240 275
-1241 272
-1242 232
-1243 288
-1244 231
-1245 216
-1246 266
-1247 193
-1248 243
-1249 244
-1250 315
-1251 244
-1252 241
-1253 255
-1254 237
-1255 297
-1256 232
-1257 288
-1258 266
-1259 244
-1260 268
-1261 217
-1262 338
-1263 308
-1264 272
-1265 265
-1266 332
-1267 257
-1268 235
-1269 289
-1270 259
-1271 332
-1272 248
-1273 256
-1274 333
-1275 245
-1276 192
-1277 276
-1278 245
-1279 222
-1280 261
-1281 222
-1282 289
-1283 224
-1284 263
-1285 313
-1286 219
-1287 224
-1288 325
-1289 318
-1290 243
-1291 299
-1292 259
-1293 291
-1294 235
-1295 336
-1296 305
-1297 248
-1298 356
-1299 316
-1300 282
-1301 304
-1302 279
-1303 298
-1304 282
-1305 360
-1306 250
-1307 397
-1308 294
-1309 391
-1310 309
-1311 389
-1312 289
-1313 309
-1314 276
-1315 373
-1316 279
-1317 266
-1318 339
-1319 312
-1320 318
-1321 296
-1322 320
-1323 287
-1324 357
-1325 295
-1326 284
-1327 300
-1328 319
-1329 309
-1330 298
-1331 283
-1332 308
-1333 222
-1334 291
-1335 225
-1336 334
-1337 247
-1338 274
-1339 292
-1340 294
-1341 333
-1342 269
-1343 338
-1344 281
-1345 227
-1346 274
-1347 343
-1348 290
-1349 323
-1350 351
-1351 313
-1352 307
-1353 307
-1354 326
-1355 331
-1356 285
-1357 289
-1358 330
-1359 384
-1360 308
-1361 327
-1362 399
-1363 313
-1364 286
-1365 299
-1366 344
-1367 243
-1368 286
-1369 303
-1370 234
-1371 401
-1372 307
-1373 354
-1374 324
-1375 284
-1376 273
-1377 375
-1378 302
-1379 291
-1380 272
-1381 496
-1382 248
-1383 359
-1384 329
-1385 304
-1386 315
-1387 338
-1388 319
-1389 283
-1390 358
-1391 295
-1392 239
-1393 293
-1394 294
-1395 262
-1396 294
-1397 173
-1398 208
-1399 285
-1400 327
-1401 293
-1402 344
-1403 271
-1404 373
-1405 298
-1406 374
-1407 207
-1408 317
-1409 331
-1410 298
-1411 372
-1412 334
-1413 356
-1414 259
-1415 381
-1416 258
-1417 256
-1418 327
-1419 365
-1420 293
-1421 301
-1422 298
-1423 338
-1424 268
-1425 298
-1426 206
-1427 291
-1428 253
-1429 260
-1430 295
-1431 188
-1432 463
-1433 244
-1434 281
-1435 162
-1436 261
-1437 235
-1438 316
-1439 266
-1440 228
-1441 253
-1442 266
-1443 238
-1444 280
-1445 232
-1446 293
-1447 183
-1448 178
-1449 143
-1450 264
-1451 186
-1452 178
-1453 198
-1454 218
-1455 185
-1456 110
-1457 183
-1458 176
-1459 179
-1460 138
-1461 218
-1462 131
-1463 218
-1464 212
-1465 226
-1466 219
-1467 152
-1468 187
-1469 136
-1470 189
-1471 212
-1472 203
-1473 116
-1474 194
-1475 150
-1476 237
-1477 131
-1478 263
-1479 228
-1480 241
-1481 234
-1482 260
-1483 218
-1484 187
-1485 226
-1486 196
-1487 166
-1488 269
-1489 274
-1490 142
-1491 235
-1492 142
-1493 233
-1494 200
-1495 180
-1496 247
-1497 222
-1498 183
-1499 227
-1500 181
-1501 242
-1502 166
-1503 256
-1504 164
-1505 183
-1506 216
-1507 264
-1508 205
-1509 231
-1510 258
-1511 235
-1512 162
-1513 167
-1514 153
-1515 157
-1516 200
-1517 198
-1518 220
-1519 245
-1520 246
-1521 126
-1522 230
-1523 141
-1524 156
-1525 219
-1526 204
-1527 198
-1528 202
-1529 218
-1530 126
-1531 190
-1532 141
-1533 249
-1534 125
-1535 259
-1536 133
-1537 245
-1538 140
-1539 220
-1540 154
-1541 218
-1542 245
-1543 196
-1544 247
-1545 222
-1546 220
-1547 213
-1548 139
-1549 123
-1550 234
-1551 219
-1552 146
-1553 153
-1554 212
-1555 149
-1556 229
-1557 144
-1558 225
-1559 197
-1560 227
-1561 204
-1562 136
-1563 131
-1564 208
-1565 118
-1566 204
-1567 209
-1568 223
-1569 126
-1570 147
-1571 193
-1572 137
-1573 205
-1574 222
-1575 130
-1576 221
-1577 137
-1578 201
-1579 130
-1580 230
-1581 135
-1582 247
-1583 149
-1584 216
-1585 162
-1586 214
-1587 132
-1588 231
-1589 217
-1590 236
-1591 148
-1592 158
-1593 160
-1594 140
-1595 214
-1596 156
-1597 160
-1598 240
-1599 129
-1600 158
-1601 205
-1602 149
-1603 135
-1604 232
-1605 147
-1606 216
-1607 114
-1608 190
-1609 137
-1610 227
-1611 145
-1612 174
-1613 236
-1614 130
-1615 199
-1616 144
-1617 132
-1618 216
-1619 146
-1620 202
-1621 103
-1622 231
-1623 125
-1624 174
-1625 208
-1626 214
-1627 200
-1628 144
-1629 127
-1630 187
-1631 122
-1632 188
-1633 187
-1634 182
-1635 159
-1636 218
-1637 123
-1638 167
-1639 131
-1640 196
-1641 181
-1642 190
-1643 193
-1644 181
-1645 112
-1646 165
-1647 126
-1648 163
-1649 131
-1650 175
-1651 127
-1652 122
-1653 162
-1654 103
-1655 188
-1656 134
-1657 157
-1658 180
-1659 207
-1660 97
-1661 157
-1662 127
-1663 196
-1664 132
-1665 123
-1666 185
-1667 107
-1668 130
-1669 201
-1670 127
-1671 206
-1672 123
-1673 173
-1674 103
-1675 134
-1676 202
-1677 127
-1678 193
-1679 103
-1680 125
-1681 126
-1682 197
-1683 168
-1684 193
-1685 117
-1686 133
-1687 128
-1688 112
-1689 180
-1690 185
-1691 198
-1692 136
-1693 170
-1694 124
-1695 186
-1696 179
-1697 188
-1698 163
-1699 200
-1700 106
-1701 164
-1702 152
-1703 134
-1704 123
-1705 105
-1706 209
-1707 108
-1708 135
-1709 164
-1710 166
-1711 131
-1712 161
-1713 118
-1714 124
-1715 170
-1716 159
-1717 119
-1718 122
-1719 122
-1720 166
-1721 163
-1722 169
-1723 103
-1724 114
-1725 95
-1726 145
-1727 158
-1728 166
-1729 137
-1730 138
-1731 108
-1732 153
-1733 113
-1734 126
-1735 145
-1736 111
-1737 120
-1738 120
-1739 110
-1740 109
-1741 143
-1742 113
-1743 88
-1744 98
+0
+1199040
+259
+228
+229
+88
+1597
+157
+154
+167
+201
+152
+167
+171
+167
+177
+152
+219
+171
+189
+184
+179
+181
+183
+177
+178
+182
+177
+187
+189
+175
+188
+184
+178
+193
+185
+177
+208
+170
+177
+191
+185
+176
+205
+170
+209
+180
+159
+190
+195
+169
+204
+204
+212
+206
+198
+240
+184
+214
+221
+205
+203
+195
+210
+207
+212
+218
+203
+197
+198
+212
+202
+215
+212
+184
+224
+198
+210
+204
+196
+233
+179
+233
+152
+306
+202
+189
+212
+200
+208
+217
+202
+196
+191
+205
+201
+188
+228
+172
+198
+222
+200
+194
+193
+200
+196
+190
+222
+184
+190
+224
+176
+220
+193
+195
+198
+187
+202
+195
+190
+223
+180
+228
+187
+202
+195
+186
+196
+194
+188
+222
+170
+199
+207
+172
+222
+187
+192
+189
+185
+191
+194
+187
+193
+195
+184
+218
+169
+199
+204
+168
+206
+185
+199
+188
+219
+192
+191
+216
+212
+169
+214
+215
+170
+212
+213
+189
+188
+215
+217
+174
+214
+214
+191
+189
+213
+186
+186
+214
+203
+173
+213
+212
+174
+214
+215
+193
+186
+214
+188
+188
+214
+211
+165
+214
+209
+192
+185
+211
+191
+184
+216
+201
+174
+212
+213
+195
+182
+214
+190
+188
+212
+189
+187
+214
+214
+172
+212
+212
+187
+185
+211
+184
+184
+212
+205
+169
+214
+209
+164
+201
+211
+189
+184
+209
+187
+184
+212
+197
+172
+207
+202
+172
+207
+207
+172
+208
+209
+181
+185
+212
+192
+182
+212
+213
+168
+212
+214
+193
+183
+209
+191
+184
+214
+202
+171
+214
+213
+171
+215
+212
+189
+187
+211
+196
+184
+212
+217
+171
+213
+212
+185
+190
+214
+196
+185
+214
+217
+174
+217
+215
+192
+191
+216
+199
+189
+216
+219
+167
+215
+210
+189
+190
+222
+205
+174
+215
+218
+173
+214
+220
+184
+189
+223
+200
+191
+217
+219
+162
+209
+224
+196
+196
+221
+221
+167
+213
+228
+163
+225
+223
+198
+195
+220
+228
+167
+220
+223
+198
+191
+224
+219
+172
+222
+221
+199
+197
+221
+213
+179
+224
+223
+171
+224
+219
+200
+192
+224
+226
+174
+224
+219
+200
+196
+223
+227
+175
+225
+226
+198
+193
+224
+223
+174
+227
+225
+202
+193
+223
+205
+195
+225
+226
+198
+195
+223
+229
+179
+224
+229
+193
+195
+229
+232
+172
+230
+226
+190
+193
+232
+231
+185
+234
+227
+209
+199
+232
+223
+178
+235
+234
+213
+203
+242
+238
+211
+210
+241
+242
+187
+241
+236
+215
+209
+235
+244
+210
+201
+240
+240
+213
+208
+243
+229
+199
+237
+245
+202
+213
+243
+241
+197
+214
+236
+246
+219
+209
+241
+234
+192
+238
+251
+215
+207
+249
+253
+219
+214
+251
+252
+222
+221
+255
+254
+231
+222
+260
+253
+226
+218
+259
+258
+227
+219
+258
+256
+230
+220
+258
+261
+208
+223
+260
+259
+233
+223
+261
+261
+214
+224
+268
+267
+233
+232
+266
+266
+232
+226
+274
+276
+246
+238
+268
+275
+278
+204
+271
+283
+271
+239
+236
+284
+276
+236
+239
+277
+283
+289
+215
+275
+283
+283
+243
+246
+288
+288
+249
+233
+288
+292
+291
+248
+244
+289
+290
+261
+249
+287
+293
+294
+231
+240
+289
+282
+251
+237
+283
+284
+285
+218
+279
+289
+277
+257
+240
+287
+291
+285
+260
+237
+297
+296
+248
+249
+293
+296
+292
+215
+296
+296
+296
+262
+249
+296
+302
+300
+246
+252
+301
+302
+270
+255
+297
+301
+305
+246
+252
+301
+306
+308
+268
+254
+310
+310
+305
+274
+259
+307
+315
+294
+249
+310
+315
+317
+314
+246
+314
+320
+314
+303
+246
+311
+322
+320
+274
+268
+313
+322
+324
+336
+278
+262
+326
+326
+277
+261
+328
+316
+322
+286
+269
+316
+322
+324
+287
+330
+265
+322
+328
+322
+290
+268
+321
+322
+321
+290
+269
+321
+322
+327
+277
+266
+322
+326
+315
+279
+264
+321
+322
+326
+281
+267
+327
+325
+325
+269
+280
+322
+326
+325
+281
+270
+321
+329
+320
+272
+268
+320
+328
+325
+265
+271
+326
+328
+321
+288
+268
+322
+327
+321
+278
+269
+321
+320
+320
+285
+265
+320
+326
+321
+276
+267
+321
+323
+326
+279
+268
+322
+323
+315
+275
+265
+321
+312
+316
+274
+262
+321
+314
+316
+274
+263
+317
+315
+313
+270
+259
+312
+307
+315
+228
+305
+312
+311
+287
+239
+306
+305
+310
+265
+253
+306
+302
+305
+248
+250
+300
+302
+266
+255
+292
+296
+298
+243
+248
+300
+298
+300
+258
+247
+300
+296
+243
+246
+297
+297
+294
+262
+250
+293
+289
+264
+246
+294
+292
+293
+255
+245
+297
+291
+254
+293
+243
+287
+288
+254
+237
+293
+284
+281
+216
+282
+288
+282
+249
+244
+282
+283
+246
+234
+282
+283
+276
+241
+237
+283
+278
+232
+237
+280
+279
+249
+237
+275
+283
+253
+278
+240
+279
+278
+236
+237
+276
+275
+245
+231
+275
+276
+268
+205
+266
+276
+267
+205
+270
+275
+276
+239
+231
+272
+272
+228
+230
+272
+267
+253
+212
+271
+268
+272
+209
+266
+272
+267
+235
+231
+267
+264
+237
+228
+264
+264
+235
+225
+267
+260
+240
+220
+260
+264
+231
+223
+260
+264
+226
+223
+264
+260
+233
+221
+256
+261
+219
+219
+257
+257
+223
+223
+260
+254
+232
+222
+261
+257
+220
+215
+260
+257
+222
+221
+260
+257
+225
+216
+258
+252
+221
+216
+260
+254
+214
+218
+256
+253
+228
+221
+254
+253
+226
+221
+247
+250
+217
+206
+252
+257
+195
+244
+249
+249
+190
+247
+251
+250
+195
+247
+249
+218
+213
+248
+243
+218
+213
+244
+246
+222
+211
+244
+248
+188
+240
+247
+231
+197
+246
+247
+218
+208
+244
+241
+219
+208
+244
+240
+215
+210
+245
+244
+189
+238
+241
+211
+207
+240
+241
+208
+206
+240
+237
+188
+238
+240
+237
+187
+240
+237
+214
+201
+239
+234
+184
+237
+236
+224
+188
+239
+237
+214
+201
+240
+236
+203
+204
+234
+227
+187
+235
+238
+199
+205
+235
+227
+186
+230
+235
+211
+202
+234
+235
+204
+203
+236
+233
+191
+234
+234
+208
+204
+232
+235
+213
+200
+233
+225
+184
+235
+232
+211
+199
+233
+228
+184
+230
+231
+207
+198
+232
+231
+175
+226
+232
+214
+188
+232
+229
+207
+197
+229
+222
+180
+232
+228
+207
+203
+232
+234
+183
+232
+229
+208
+198
+231
+229
+207
+199
+229
+200
+196
+227
+230
+193
+200
+229
+203
+195
+228
+227
+194
+197
+229
+200
+195
+227
+226
+194
+197
+227
+202
+195
+227
+226
+198
+197
+223
+198
+194
+226
+227
+178
+222
+223
+193
+194
+224
+227
+180
+227
+227
+197
+194
+222
+224
+172
+223
+224
+192
+192
+224
+207
+196
+227
+224
+193
+194
+224
+225
+180
+227
+223
+198
+195
+223
+211
+184
+222
+224
+197
+197
+222
+202
+194
+223
+225
+178
+222
+224
+212
+182
+224
+223
+174
+226
+223
+205
+193
+223
+226
+173
+221
+224
+192
+195
+223
+211
+184
+224
+224
+199
+196
+224
+203
+194
+225
+221
+168
+218
+224
+197
+196
+221
+223
+203
+191
+225
+201
+196
+223
+224
+173
+223
+227
+204
+198
+227
+224
+179
+222
+227
+204
+195
+226
+227
+182
+227
+226
+202
+199
+227
+226
+200
+197
+228
+196
+198
+227
+226
+206
+196
+226
+199
+199
+226
+228
+181
+223
+229
+206
+200
+226
+227
+204
+200
+230
+227
+186
+226
+230
+201
+199
+232
+224
+186
+229
+229
+211
+199
+232
+229
+184
+230
+232
+232
+187
+232
+232
+205
+201
+232
+229
+187
+232
+230
+205
+200
+229
+232
+177
+229
+232
+201
+204
+232
+235
+210
+205
+235
+235
+181
+235
+234
+209
+206
+238
+226
+191
+207
+242
+214
+205
+234
+232
+199
+204
+240
+241
+181
+231
+239
+219
+199
+239
+234
+192
+204
+234
+236
+184
+237
+248
+209
+205
+236
+240
+212
+211
+237
+240
+220
+206
+237
+228
+194
+239
+242
+218
+206
+243
+234
+215
+207
+242
+237
+187
+238
+241
+212
+209
+239
+240
+209
+208
+240
+240
+210
+206
+245
+225
+206
+244
+244
+232
+195
+247
+243
+223
+207
+244
+246
+220
+212
+247
+244
+184
+240
+243
+250
+184
+244
+244
+218
+209
+244
+244
+216
+210
+244
+243
+221
+210
+247
+242
+186
+240
+246
+231
+194
+245
+243
+220
+209
+244
+247
+217
+210
+242
+244
+184
+240
+243
+224
+211
+243
+246
+207
+209
+245
+240
+222
+209
+240
+244
+218
+206
+242
+241
+189
+241
+241
+216
+208
+241
+246
+213
+213
+239
+241
+220
+207
+244
+240
+186
+240
+242
+215
+209
+238
+233
+216
+201
+234
+239
+211
+205
+233
+223
+189
+234
+235
+213
+203
+231
+234
+185
+230
+238
+204
+207
+237
+234
+213
+204
+237
+236
+185
+234
+235
+204
+204
+232
+233
+209
+204
+232
+230
+187
+234
+232
+209
+201
+232
+231
+179
+227
+232
+202
+200
+234
+231
+210
+201
+229
+225
+180
+229
+229
+195
+202
+228
+237
+176
+229
+227
+207
+198
+230
+229
+183
+224
+227
+196
+197
+228
+228
+180
+221
+228
+191
+196
+222
+225
+183
+229
+224
+203
+196
+223
+225
+177
+223
+224
+204
+195
+221
+224
+172
+221
+224
+197
+197
+218
+204
+186
+221
+222
+170
+217
+221
+194
+193
+223
+220
+174
+220
+221
+194
+192
+218
+202
+180
+219
+219
+173
+214
+216
+193
+184
+218
+213
+172
+219
+221
+175
+216
+221
+192
+188
+216
+214
+173
+217
+219
+195
+192
+218
+196
+190
+217
+217
+198
+189
+213
+186
+187
+214
+198
+188
+212
+213
+173
+209
+212
+180
+189
+216
+194
+188
+214
+219
+172
+211
+217
+190
+190
+214
+202
+176
+211
+214
+171
+215
+212
+195
+184
+212
+196
+187
+213
+210
+154
+221
+214
+195
+182
+208
+187
+184
+211
+184
+183
+217
+210
+172
+213
+212
+167
+208
+211
+191
+186
+212
+205
+168
+211
+217
+164
+206
+210
+167
+207
+220
+187
+188
+213
+190
+188
+214
+216
+172
+214
+215
+192
+188
+216
+189
+187
+216
+215
+166
+211
+214
+184
+191
+218
+200
+183
+219
+217
+172
+217
+219
+193
+192
+219
+202
+178
+218
+223
+175
+213
+221
+197
+190
+210
+212
+172
+221
+219
+195
+193
+216
+210
+173
+219
+221
+173
+216
+222
+192
+192
+214
+203
+178
+223
+220
+202
+189
+224
+192
+193
+223
+223
+171
+220
+224
+193
+196
+232
+206
+196
+227
+224
+195
+196
+221
+207
+196
+223
+228
+181
+198
+227
+213
+182
+227
+230
+170
+220
+229
+200
+191
+229
+222
+206
+200
+226
+218
+189
+228
+233
+201
+203
+231
+229
+173
+228
+228
+201
+198
+232
+231
+175
+232
+235
+199
+203
+235
+231
+215
+202
+235
+218
+197
+235
+235
+190
+205
+239
+233
+179
+237
+239
+204
+208
+240
+236
+204
+206
+239
+242
+178
+241
+244
+222
+206
+240
+248
+213
+208
+243
+242
+215
+215
+245
+250
+195
+252
+254
+236
+198
+251
+255
+252
+200
+253
+257
+256
+200
+253
+257
+224
+217
+258
+256
+240
+206
+254
+259
+234
+217
+258
+260
+238
+201
+260
+262
+231
+222
+261
+258
+265
+202
+263
+269
+236
+223
+268
+260
+258
+210
+264
+262
+265
+232
+233
+269
+271
+228
+228
+273
+272
+223
+228
+270
+277
+240
+226
+276
+275
+248
+234
+276
+273
+275
+239
+232
+281
+275
+243
+231
+282
+280
+258
+214
+278
+284
+270
+210
+275
+278
+286
+224
+231
+280
+286
+245
+241
+285
+284
+284
+264
+237
+288
+284
+250
+240
+289
+286
+285
+265
+239
+290
+289
+256
+242
+291
+292
+284
+217
+289
+294
+286
+243
+236
+293
+290
+287
+208
+280
+292
+288
+235
+246
+292
+290
+257
+249
+289
+294
+280
+240
+240
+294
+277
+254
+243
+289
+284
+296
+224
+250
+281
+286
+255
+235
+296
+297
+287
+267
+255
+294
+292
+246
+237
+300
+292
+308
+263
+249
+300
+305
+276
+237
+296
+302
+297
+261
+255
+308
+306
+310
+267
+254
+300
+320
+288
+234
+297
+315
+315
+275
+266
+309
+316
+316
+285
+262
+316
+316
+323
+283
+262
+304
+300
+317
+259
+262
+324
+321
+328
+281
+244
+319
+323
+323
+271
+269
+314
+333
+324
+270
+260
+327
+333
+327
+281
+277
+332
+331
+332
+278
+260
+330
+334
+337
+312
+317
+276
+336
+348
+312
+298
+273
+335
+338
+339
+289
+275
+335
+340
+328
+290
+267
+332
+332
+336
+293
+277
+327
+332
+338
+330
+292
+279
+337
+338
+335
+281
+271
+330
+337
+334
+293
+272
+336
+339
+332
+287
+277
+337
+337
+335
+277
+271
+335
+332
+335
+308
+292
+252
+325
+325
+301
+248
+334
+325
+323
+284
+261
+315
+333
+319
+280
+266
+308
+328
+315
+286
+331
+259
+326
+317
+328
+284
+251
+316
+311
+295
+292
+257
+294
+331
+256
+263
+333
+316
+314
+254
+261
+315
+316
+308
+255
+260
+308
+316
+304
+276
+258
+311
+310
+302
+285
+249
+310
+302
+266
+252
+302
+300
+289
+252
+246
+308
+301
+270
+273
+244
+298
+294
+254
+243
+293
+292
+283
+248
+242
+290
+290
+250
+240
+294
+273
+271
+223
+289
+285
+303
+253
+240
+291
+286
+268
+221
+286
+290
+287
+253
+243
+283
+283
+249
+234
+280
+281
+284
+248
+243
+283
+282
+247
+233
+278
+280
+265
+214
+279
+280
+269
+205
+256
+280
+271
+226
+233
+269
+274
+233
+229
+273
+270
+245
+228
+270
+274
+229
+236
+271
+271
+257
+210
+256
+268
+258
+242
+237
+268
+271
+224
+225
+264
+263
+237
+225
+264
+263
+235
+222
+264
+264
+226
+223
+264
+259
+229
+222
+263
+258
+224
+219
+263
+262
+220
+220
+259
+260
+229
+216
+260
+256
+214
+216
+253
+256
+228
+215
+252
+255
+224
+217
+256
+250
+225
+216
+254
+249
+222
+214
+249
+250
+210
+212
+248
+251
+194
+244
+247
+247
+193
+242
+247
+220
+206
+246
+239
+218
+207
+244
+241
+184
+240
+242
+218
+201
+240
+238
+200
+204
+234
+239
+206
+201
+238
+217
+204
+233
+238
+201
+202
+235
+224
+186
+234
+235
+206
+204
+230
+234
+177
+229
+235
+213
+202
+229
+235
+197
+198
+235
+232
+189
+232
+234
+211
+198
+232
+229
+210
+198
+228
+216
+200
+232
+228
+210
+194
+230
+232
+181
+230
+230
+205
+197
+232
+229
+208
+202
+231
+200
+200
+229
+229
+171
+229
+227
+217
+186
+230
+229
+204
+196
+226
+229
+182
+228
+227
+202
+196
+224
+228
+178
+222
+225
+199
+194
+225
+216
+182
+224
+224
+167
+224
+224
+214
+182
+224
+224
+203
+192
+225
+201
+192
+223
+223
+178
+224
+220
+201
+187
+223
+222
+170
+225
+224
+191
+191
+223
+227
+177
+223
+221
+200
+190
+225
+192
+193
+222
+221
+180
+222
+223
+199
+192
+222
+213
+177
+223
+220
+187
+191
+225
+205
+181
+221
+220
+197
+192
+219
+194
+190
+224
+218
+178
+221
+222
+195
+196
+219
+206
+181
+219
+222
+196
+189
+219
+188
+188
+219
+222
+166
+219
+221
+198
+189
+219
+210
+176
+219
+215
+170
+218
+217
+184
+188
+218
+199
+190
+219
+216
+167
+217
+216
+192
+185
+217
+193
+186
+216
+213
+166
+212
+214
+192
+188
+213
+191
+186
+213
+204
+173
+215
+216
+193
+186
+216
+205
+173
+217
+198
+186
+212
+215
+163
+208
+217
+192
+184
+216
+188
+185
+214
+213
+163
+216
+214
+195
+187
+216
+199
+185
+216
+214
+165
+213
+214
+196
+186
+215
+198
+188
+215
+214
+171
+217
+216
+196
+186
+217
+191
+188
+219
+212
+176
+212
+219
+182
+194
+218
+203
+178
+218
+218
+173
+218
+216
+187
+189
+216
+200
+190
+217
+218
+198
+186
+217
+199
+189
+220
+206
+176
+219
+218
+197
+192
+218
+200
+190
+218
+217
+173
+216
+219
+198
+192
+219
+220
+172
+222
+222
+192
+192
+222
+200
+194
+223
+221
+193
+191
+224
+198
+194
+221
+222
+173
+220
+224
+201
+195
+223
+213
+183
+223
+224
+201
+196
+224
+207
+196
+226
+226
+202
+196
+226
+215
+186
+224
+224
+204
+199
+223
+231
+180
+226
+227
+208
+199
+227
+230
+181
+224
+230
+199
+202
+228
+230
+184
+222
+227
+200
+198
+227
+229
+182
+225
+230
+217
+189
+228
+232
+205
+197
+229
+227
+187
+230
+232
+209
+195
+229
+232
+178
+230
+231
+207
+202
+232
+229
+186
+224
+233
+213
+192
+231
+229
+206
+201
+229
+230
+189
+227
+232
+210
+200
+235
+231
+178
+224
+235
+202
+204
+237
+234
+214
+202
+238
+234
+189
+235
+233
+205
+211
+235
+238
+213
+205
+241
+238
+186
+234
+237
+207
+205
+240
+237
+212
+202
+241
+238
+217
+202
+241
+224
+193
+238
+239
+207
+208
+238
diff --git a/scenes/dragon.rt b/scenes/dragon.rt
index 7299d46..1ba5a34 100644
--- a/scenes/dragon.rt
+++ b/scenes/dragon.rt
@@ -18,10 +18,12 @@ pl	0 0 -2		0 0 1		1 // back wall
 pl	0 0 2		0 0 -1		5 // front wall
 pl	2 0 0		-1 0 0		3 // right wall
 pl	-2 0 0		1 0 0		2 // left wall
-# pl	0 2 0		0 -1 0		0 // ceiling
+pl	0 2 0		0 -1 0		0 // ceiling
 pl	0 -2 0		0 1 0		2 // floor
 
+
 qu	-1 1.999 -1	2 0 0		0 0 2		6
+# sp	1 1 0			0.5				6
 
 OBJ obj/Dragon_80K.obj
 
diff --git a/shaders/light.glsl b/shaders/light.glsl
index 1b1cee9..cfd7061 100644
--- a/shaders/light.glsl
+++ b/shaders/light.glsl
@@ -2,6 +2,7 @@ hitInfo	traceRay(Ray ray);
 
 vec3 GetEnvironmentLight(Ray ray)
 {
+    return vec3(0.);
 	vec3 sun_pos = vec3(-0.5, 0.5, 0.5);
 	float SunFocus = 1.5;
 	float SunIntensity = 1.;
diff --git a/srcs/RT.cpp b/srcs/RT.cpp
index e6eee1c..6628ebc 100644
--- a/srcs/RT.cpp
+++ b/srcs/RT.cpp
@@ -6,7 +6,7 @@
 /*   By: ycontre <ycontre@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/27 14:51:49 by TheRed            #+#    #+#             */
-/*   Updated: 2025/01/18 19:21:00 by ycontre          ###   ########.fr       */
+/*   Updated: 2025/01/18 19:28:58 by ycontre          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,8 +20,8 @@ int main(int argc, char **argv)
 		return (1);
 
 	Window		window(&scene, WIDTH, HEIGHT, "RT_GPU", 0);
-	// Shader		shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl");
-	Shader		shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/debug.glsl");
+	Shader		shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/compute.glsl");
+	// Shader		shader("shaders/vertex.vert", "shaders/frag.frag", "shaders/debug.glsl");
 
 	GLint max_gpu_size;
 	glGetIntegerv(GL_MAX_SHADER_STORAGE_BLOCK_SIZE, &max_gpu_size);
diff --git a/srcs/class/Window.cpp b/srcs/class/Window.cpp
index 47f8d48..2b0ea7a 100644
--- a/srcs/class/Window.cpp
+++ b/srcs/class/Window.cpp
@@ -6,7 +6,7 @@
 /*   By: ycontre <ycontre@student.42.fr>            +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/13 16:16:24 by TheRed            #+#    #+#             */
-/*   Updated: 2025/01/18 19:22:30 by ycontre          ###   ########.fr       */
+/*   Updated: 2025/01/18 19:24:04 by ycontre          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */